Declare fast forward / record previous work
authorIan Jackson <ian.jackson@citrix.com>
Fri, 5 Oct 2018 17:35:23 +0000 (18:35 +0100)
committerIan Jackson <ian.jackson@citrix.com>
Fri, 5 Oct 2018 17:35:23 +0000 (18:35 +0100)
[git-debrebase pseudomerge: stitch]


Trivial merge